merge
authorIan Campbell <ian.campbell@xensource.com>
Fri, 23 Feb 2007 16:57:34 +0000 (16:57 +0000)
committerIan Campbell <ian.campbell@xensource.com>
Fri, 23 Feb 2007 16:57:34 +0000 (16:57 +0000)

Trivial merge